(set-face-attribute): Fix previous change.

diff --git a/lisp/faces.el b/lisp/faces.el
index 2bd1ffcfc8d49dbeb1e7068e11d1eeba66a70712..f3e8868619665ad23d54edfb565f4c865461aa53 100644 (file)
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -706,6 +706,7 @@ like an underlying face would be, with higher priority than underlying faces."
       ;; when we update the frame's font param fro the attributes.
       (let ((inhibit-face-set-after-frame-default t))
        (if (and (eq (car args) :family)
+                (stringp (cadr args))
                 (string-match "\\([^-]*\\)-\\([^-]*\\)" (cadr args)))
            (let ((foundry (match-string 1 (cadr args)))
                  (family (match-string 2 (cadr args))))